From e6dca44e9dcba51965f40ed72caefa34d713da05 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:18:44 -0700 Subject: [PATCH] minor cleanups. (#820) empty statements, unreachable code, member funct can be const. --- gui/processwait.h | 2 +- gui/runmachine.cc | 13 ++++--------- gui/runmachine.h | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gui/processwait.h b/gui/processwait.h index 334e8e54d..f13f7dc0d 100644 --- a/gui/processwait.h +++ b/gui/processwait.h @@ -45,7 +45,7 @@ class ProcessWaitDialog: public QDialog public: ProcessWaitDialog(QWidget* parent, QProcess* process); - QString getOutputString() + QString getOutputString() const { return QString::fromLocal8Bit(outputString_); } diff --git a/gui/runmachine.cc b/gui/runmachine.cc index 6bc3eceb0..80465a5c6 100644 --- a/gui/runmachine.cc +++ b/gui/runmachine.cc @@ -33,19 +33,14 @@ QString RunMachine::decodeProcessError(QProcess::ProcessError err) switch (err) { case QProcess::FailedToStart: return tr("Process failed to start"); - break; case QProcess::Crashed: return tr("Process crashed"); - break; case QProcess::Timedout: return tr("Process timedout"); - break; case QProcess::WriteError: return tr("Error while trying to write to process"); - break; case QProcess::ReadError: return tr("Error while trying to read from process"); - break; case QProcess::UnknownError: default: return tr("Unknown process error"); @@ -141,7 +136,7 @@ void RunMachine::execute(SignalId id, qDebug() << "signal" << id << "UNEXPECTED in init state!"; } break; - }; + } break; case starting: @@ -161,7 +156,7 @@ void RunMachine::execute(SignalId id, qDebug() << "signal" << id << "UNEXPECTED in starting state!"; } break; - }; + } break; case running: @@ -209,7 +204,7 @@ void RunMachine::execute(SignalId id, qDebug() << "signal" << id << "UNEXPECTED in running state!"; } break; - }; + } break; case done: @@ -220,7 +215,7 @@ void RunMachine::execute(SignalId id, qDebug() << "UNEXPECTED State!"; } break; - }; + } if constexpr(debug) { qDebug() << "exec leaving" << state_ << id; } diff --git a/gui/runmachine.h b/gui/runmachine.h index 0c5da6371..ff3104b52 100644 --- a/gui/runmachine.h +++ b/gui/runmachine.h @@ -65,11 +65,11 @@ public: static QString decodeProcessError(QProcess::ProcessError err); int exec(); void open(); - QString getOutputString() + QString getOutputString() const { return progress_->getOutputString(); } - QString getErrorString() + QString getErrorString() const { return errorString_; } -- 2.30.2